merge trunk

diff --cc lisp/ChangeLog
index 57185cea350176f63b3aebab2d9f46b77d39c291,2b348842656e12d5b0d19d275504ed88f55fed6e..01a49cab0d8114ca95480546eca1c39c337615f7
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,11 -1,8 +1,16 @@@
 +2010-08-25  Kenichi Handa  <handa@m17n.org>
 +
 +      * language/misc-lang.el ("Arabic"): New language environment.
 +      Setup composition-function-table for Arabic characters.
 +
 +      * international/fontset.el (setup-default-fontset): Fix typo for
 +      arabic OTF spec (fini->fina).
 +
+ 2010-08-25  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * menu-bar.el (menu-bar-set-tool-bar-position): Set frame parameter
+       on all frames.
+ 
  2010-08-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
  
        * whitespace.el: Allow cleaning up blanks without blank